From: Glenn Morris <rgm@gnu.org>
Date: Sat, 14 Jan 2012 02:07:49 +0000 (-0500)
Subject: * lisp/dired.el (dired-get-filename): Fix 'verbatim case of previous change.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~1185
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=7029f17dcb0f6e61652a4dc0e4fa4902760a593e;p=emacs.git

* lisp/dired.el (dired-get-filename): Fix 'verbatim case of previous change.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0b149a63203..2018963e6c9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-14  Glenn Morris  <rgm@gnu.org>
+
+	* dired.el (dired-get-filename): Fix 'verbatim case of previous change.
+
 2012-01-13  Glenn Morris  <rgm@gnu.org>
 
 	* dired.el (dired-switches-escape-p): New function.
diff --git a/lisp/dired.el b/lisp/dired.el
index 42d2c7d7a5a..f1a778ad05a 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -2107,10 +2107,15 @@ Otherwise, an error occurs in these cases."
           ;; Unescape any spaces escaped by ls -b (bug#10469).
           ;; Other -b quotes, eg \t, \n, work transparently.
           (if (dired-switches-escape-p dired-actual-switches)
-              (let ((start 0))
+              (let ((start 0)
+                    (rep "")
+                    (shift -1))
+                (if (eq localp 'verbatim)
+                    (setq rep "\\\\"
+                          shift +1))
                 (while (string-match "\\(\\\\\\) " file start)
-                  (setq file (replace-match "" nil t file 1)
-                        start (1- (match-end 0))))))
+                  (setq file (replace-match rep nil t file 1)
+                        start (+ shift (match-end 0))))))
 	  (when (eq system-type 'windows-nt)
 	    (save-match-data
 	      (let ((start 0))